fixes

jamesperet 9 years ago
parent
commit
1e620fea38

+ 5 - 3
app/assets/javascripts/start.js

@@ -1,8 +1,8 @@
1 1
 // get the value of the bottom of the #main element by adding the offset of that element plus its height, set it as a variable
2
-$( document ).ready(function() {
2
+function attachHandler(jQuery) {
3 3
 	var mainbottom = $('#myCarousel').offset().top + ($('#myCarousel').height()*2)-10;
4 4
 	var about_bottom = $('#post').offset().top +  $('#post-image').height() - (screen.height - $('#post-image').height() + 152);
5
-	var post_bottom = $('.feature-post-text').offset().top +  $('.feature-post-text').height() - (screen.height - $('.feature-post-text').height() + 232);
5
+	var post_bottom = $('.feature-post-text').offset().top +  $('.feature-post-text').height() - (screen.height - $('.feature-post-text').height() + 500);
6 6
 
7 7
 	// on scroll, 
8 8
 	$(window).on('scroll',function(){
@@ -69,5 +69,7 @@ $( document ).ready(function() {
69 69
 	    }, 1000);
70 70
 	});
71 71
 	
72
-});
72
+};
73 73
 
74
+$(document).ready(attachHandler);
75
+$(document).load(attachHandler);

+ 1 - 1
app/views/layouts/maintenance_mode.html.erb

@@ -4,7 +4,7 @@
4 4
     <meta charset="utf-8">
5 5
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
6 6
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
-    <title><%= content_for?(:title) ? yield(:title) : "RailsWebsiteTemplate" %></title>
7
+    <title>Velvet Design - <%= @config.maintenance_title %></title>
8 8
     <%= csrf_meta_tags %>
9 9
 
10 10
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->

+ 1 - 1
app/views/layouts/velvet_layout.html.erb

@@ -4,7 +4,7 @@
4 4
     <meta charset="utf-8">
5 5
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
6 6
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
-    <title><%= content_for?(:title) ? yield(:title) : "RailsWebsiteTemplate" %></title>
7
+    <title>Velvet Design</title>
8 8
     <%= csrf_meta_tags %>
9 9
 
10 10
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->

+ 4 - 0
app/views/start/index.html.erb

@@ -77,6 +77,10 @@
77 77
 	</div>
78 78
 </div>
79 79
 <div class="clearfix"></div>
80
+
81
+
82
+<div style="width: 100%; background-color: white; height: 0px"></div>
83
+
80 84
 <div >
81 85
 	<footer class="velvet">
82 86
 	  <hr>